From: Kenichi Handa <handa@m17n.org>
Date: Fri, 17 Feb 2012 07:33:15 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~733^2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=b3d964cbf03f467ede91e656b3dde8cbdd98ff20;p=emacs.git

merge trunk
---

b3d964cbf03f467ede91e656b3dde8cbdd98ff20
diff --cc lisp/ChangeLog
index d57ad3feb51,0d5ed837a26..da9a7175947
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,10 -1,24 +1,31 @@@
- 2012-02-16  Kenichi Handa  <handa@m17n.org>
++2012-02-17  Kenichi Handa  <handa@m17n.org>
 +
 +	* international/charprop.el:
 +	* international/uni-name.el:
 +	* international/uni-old-name.el:
 +	* international/uni-comment.el: Regenerate.
 +
+ 2012-02-16  Glenn Morris  <rgm@gnu.org>
+ 
+ 	* calendar/cal-hebrew.el (calendar-hebrew-list-yahrzeits):
+ 	Interactively in calendar buffer, give an error if not on a date.
+ 
+ 2012-02-15  Glenn Morris  <rgm@gnu.org>
+ 
+ 	* shell.el (shell-delimiter-argument-list):
+ 	Revert 2011-02-17 change.  (Bug#8027)
+ 
+ 2012-02-15  Chong Yidong  <cyd@gnu.org>
+ 
+ 	* minibuffer.el (completion-at-point-functions): Doc fix.
+ 
+ 	* custom.el (defcustom): Doc fix; note use of defvar.
+ 
+ 2012-02-15  Glenn Morris  <rgm@gnu.org>
+ 
+ 	* mail/smtpmail.el (smtpmail-smtp-user, smtpmail-stream-type):
+ 	Doc fixes.
+ 
  2012-02-14  Glenn Morris  <rgm@gnu.org>
  
  	* mail/smtpmail.el (smtpmail-query-smtp-server): Give it a doc.